| commit | ff32ce95c8b4cd62689e5258536442eee6bd78a3 | [log] [tgz] |
|---|---|---|
| author | Jaesoo Lee <jaesoo@google.com> | Fri Apr 28 03:36:55 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Apr 28 03:36:55 2017 +0000 |
| tree | f84d0d8a00b46d84281b883faf739ccb74aaec9f | |
| parent | 8030d3018c7fa4bf30d0eed6c117243d2ea5a10b [diff] | |
| parent | c6837c6e067f86c281fc7edd1d0de0a4cc894c38 [diff] |
resolve merge conflicts of afc0aa78f to oc-dev-plus-aosp am: 1e00517d71 Change-Id: Ic9c11a227c76aca0f0d91531a8bddcd59f5ed821