| commit | 669716d27c713708cc1b43849fa80a85e7e45ffc | [log] [tgz] |
|---|---|---|
| author | Adrien Schildknecht <adriens@google.com> | Sat Dec 03 04:14:53 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Sat Dec 03 04:14:53 2016 +0000 |
| tree | eecc0a8d4f7aa4f12068f81aa0cfbaf4b4291828 | |
| parent | fb5bdda7cf7a2b4b4982fb922304a9a343138c4e [diff] | |
| parent | aec73165464c2ea8233bc3cbbbdb17085bce91dc [diff] |
Manually merge commit '61e74d7' into stage-aosp-master am: 9f9a239ca3 am: aec7316546 Change-Id: I6ad5c7ac12a9ef2afdc8352a614817c2a1323dd3