| commit | bf0a3ec0faac4f95f0bc88ab470f33d5b5c7d5b7 | [log] [tgz] |
|---|---|---|
| author | Yi Kong <yikong@google.com> | Tue May 02 20:00:21 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue May 02 20:00:21 2017 +0000 |
| tree | 4fbf08aa8e3a3d4a15b3b3490140031b5b0638e7 | |
| parent | 8a532cf2576bddfc52e959f14f61ab50825faeeb [diff] | |
| parent | 51ccc24d57b966de22d54bd83e21fdd137bbba4d [diff] |
Merge "Resolve merge conflicts of ccc5b9bbd02a to oc-dev-plus-aosp" into oc-dev-plus-aosp am: 51ccc24d57 Change-Id: Ib6109c22c278ce00ad1a0c6d3d1e6a7903cfad2f