| commit | 4efb75d656f076f7dbd053bb81766614078b259b | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Wed May 03 02:12:00 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed May 03 02:12:00 2017 +0000 |
| tree | 11d27f82b21bdb09339ac4ebbbc042f6a945432e | |
| parent | 5f506480a201ddc00e166cbcb861069be543afe2 [diff] | |
| parent | ca51723dce743d357cb2866d903d4162fb521a5d [diff] |
Merge changes I155f9f77,Ibb1aa07a into oc-dev-plus-aosp am: ca51723dce -s ours Change-Id: I57b9fd3e394e5d9278f90fe0deee81317f0e95cb