| commit | 5bf18e684d354a40c1a3283fc52608ce7c031253 | [log] [tgz] |
|---|---|---|
| author | Adam Lesinski <adamlesinski@google.com> | Wed Jul 05 21:41:40 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jul 05 21:41:40 2017 +0000 |
| tree | 7773c8f10457c6f6bb29f14ef0063b49beec9bff | |
| parent | 74cf204ab947e0c27ede29dd8735fef3d06df2f6 [diff] | |
| parent | 2d0f12c43e269337165db6142dba6ddb66e13ca0 [diff] |
Merge "Merge "Merge "Merge "Cherry-pick 7ad1110ecd6a840fcd2895c62668828a1ca029c6" am: 6fd0671265 -s ours" into stage-aosp-master am: a998cffb1b -s ours" into oc-dev-plus-aosp am: 530a622f60 -s ours" into oc-dr1-dev-plus-aosp am: 2d0f12c43e -s ours Change-Id: I004e5914092db46befbfb8f2aececc40fd99bc66