| commit | bd90648a93570af2c8a2aa74fd4487314869fc60 | [log] [tgz] |
|---|---|---|
| author | Justin Yun <justinyun@google.com> | Thu Aug 10 02:03:38 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Aug 10 02:03:38 2017 +0000 |
| tree | 6cdb4c5652e4f319ff12b6c7aece235e428abbda | |
| parent | 15ea0b3e5b6e56cd76fffde78dd6aca4d156b639 [diff] | |
| parent | 0b0f33d9860a0328e2da2fd60d9f9f0c5b868ca5 [diff] |
Merge "Merge commit '8f80b6fd9cbffb3d43f038355623e60608d46833' into manual_merge_8f80b6f" into oc-dr1-dev-plus-aosp am: 0b0f33d986 -s ours Change-Id: Ic957932b3c03f0bed65a66047e6e8bdeb6c63daf