| commit | 06ad76c318b724950b193d4a5e57e51c7a9d4b9b | [log] [tgz] |
|---|---|---|
| author | Ivan Podogov <ginkage@google.com> | Tue Dec 13 20:56:31 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Dec 13 20:56:31 2016 +0000 |
| tree | e1e416b703a4889aee2833261ba182d3fc2c88de | |
| parent | 60192004bf24082677b7888df41668c8bf06bbb4 [diff] | |
| parent | 966d2357c552e04ef5c6058d36b55b9122c601ea [diff] |
Merge "Finish resolving conflict from d23dc17" into nyc-mr2-dev-plus-aosp am: 966d2357c5 Change-Id: I20f596ecc7171d9aaa86e9a25005ac93ccbf9922