| commit | 24ee1d285ecf41ae3e980efc4f42b1efda31767e | [log] [tgz] |
|---|---|---|
| author | Jin Qian <jinqian@google.com> | Sat Dec 03 04:15:04 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Sat Dec 03 04:15:04 2016 +0000 |
| tree | 613dad301ee6463a481313ad3e5f8dfb707134a3 | |
| parent | a378587bcf57084cbb9a4b80e61ebe42ad58324a [diff] | |
| parent | f39613a549eab5d2f6d61e0a3ed9d4a857a97fa1 [diff] |
Manually merge commit '398e284' into stage-aosp-master am: e591ad15a0 am: f39613a549 Change-Id: I85e3ea26f9406a8852a2160a9ddcd761c1ac4ac2