| commit | 53cb4c52696eda39a84f54a4fb4a373513e3588a | [log] [tgz] |
|---|---|---|
| author | Alain Vongsouvanh <alainv@google.com> | Fri Jan 06 10:56:52 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jan 06 10:56:52 2017 +0000 |
| tree | 72faaf4ac4fd836de8604611fe43ea76a1a18aa0 | |
| parent | 0955148318f5c02d2044746302026403fb543ec6 [diff] | |
| parent | 962cde0f5603cb55636b0336c0ef807e9b8fd5c1 [diff] |
Merge "resolve merge conflicts of 2fda2ce15958 to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp am: 414f8fbdbb am: 962cde0f56 Change-Id: I28628a83513f33a8ca56aede612f0e956d6bbbc5