| commit | aec73165464c2ea8233bc3cbbbdb17085bce91dc | [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 | b8de7b404ad5b08f2e342a30799a958adb8a6a39 [diff] | |
| parent | 9f9a239ca3a18a2975997ae16260b29820a1d967 [diff] |
Manually merge commit '61e74d7' into stage-aosp-master am: 9f9a239ca3 Change-Id: Ia404f62a4b3c2acda8ef063d27e10799070f9e7e