| commit | a9888fc0c42d643e29e80bd0f2394d87f3339f44 | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Thu Dec 22 19:06:09 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Dec 22 19:06:09 2016 +0000 |
| tree | 1d6150e766c8bb471d5bb0df2f26b7fc380988d0 | |
| parent | 52c35fb3a85ba5431c0dbc18bc8d7a334426c2d5 [diff] | |
| parent | b82465849450a54820758161fefe05cf61ea960f [diff] |
resolve merge conflicts of febd982 to stage-aosp-master am: 5c53fdb893 am: b824658494 Change-Id: Ic1dd2aef96889f0f68a55093cfb04b4d90f34818