| commit | 6a633d57ef209dda558f4e17242b3ef0305229e5 | [log] [tgz] |
|---|---|---|
| author | Adrien Schildknecht <adriens@google.com> | Sat Dec 03 04:13:04 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Sat Dec 03 04:13:04 2016 +0000 |
| tree | eecc0a8d4f7aa4f12068f81aa0cfbaf4b4291828 | |
| parent | 6282053b9fe121c67699b5c0e010f1297123f125 [diff] | |
| parent | a8997672d14f462e797c9ac28fae09b3ed9f2616 [diff] |
Manually merge commit '61e74d7' into stage-aosp-master am: 9f9a239ca3 Change-Id: Ia404f62a4b3c2acda8ef063d27e10799070f9e7e