| commit | 935fe4793ddd9f33aa6a88f897bf244990c2f169 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue Jul 12 02:46:04 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jul 12 02:46:04 2016 +0000 |
| tree | b13ef4224292290299ed611f479ef59f6330bfb4 | |
| parent | a6eb18f39e0fb7a4e0f520a89837c25b409c7f3c [diff] | |
| parent | 5f09d40a633b06515a02623787888632b278a283 [diff] |
resolve merge conflicts of 743b0c5 to stage-aosp-master am: 619875061d am: a7cb85ce8e am: a38bb11ff4 Change-Id: I6210632be4bb21af5c98f8e8dfe80a371f3cb649