tag | 98435baf6b683ed8315e009606f6df2971b8a533 | |
---|---|---|
tagger | The Android Open Source Project <initial-contribution@android.com> | Mon Dec 05 17:05:26 2016 -0800 |
object | 5a4f8316df580b0dbfe1e4b86819f2a6d68d7e10 |
Android n mr1 preview 2
commit | 5a4f8316df580b0dbfe1e4b86819f2a6d68d7e10 | [log] [tgz] |
---|---|---|
author | Elliott Hughes <enh@google.com> | Fri Jun 17 03:51:19 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jun 17 03:51:19 2016 +0000 |
tree | 187dc5ae554eb2afa79d1b59643473ae5dc221cf | |
parent | 6f25ce204f57a9eec9c514e5fa19ccdf8489cafd [diff] | |
parent | 2694c6a594fc3165121480b474dee919749e406b [diff] |
resolve merge conflicts of 55caa15 to stage-aosp-master am: 2694c6a594 Change-Id: Ie59976f602e937366c10fbf2ed89fc0676926c90