| commit | cba965e372462f7416a69d9709ea8bc6781ec3e4 | [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 | 6db3fce105984dd8554b010b236e6de4a0d143bd [diff] | |
| parent | 6a633d57ef209dda558f4e17242b3ef0305229e5 [diff] |
Manually merge commit '61e74d7' into stage-aosp-master am: 9f9a239ca3 am: aec7316546 Change-Id: I6ad5c7ac12a9ef2afdc8352a614817c2a1323dd3