| commit | 29030f990605b87e5a68009b3b88c8227cb35a74 | [log] [tgz] |
|---|---|---|
| author | Adrien Schildknecht <adriens@google.com> | Sat Dec 03 04:20:11 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Sat Dec 03 04:20:11 2016 +0000 |
| tree | e20930183ab1f73788aecdeb9783afa176242d0f | |
| parent | 8ecde7595025c7a0d5f6ed6ebd3c5f0f53b2c2f0 [diff] | |
| parent | 822c2b6e07f0799e9a59dca642b827ea4d6796e8 [diff] |
Manually merge commit 'bf03f2e' into stage-aosp-master am: a083ba6a48 am: 298394ac68 am: 822c2b6e07 Change-Id: I3682e1a156e0c5740b57f51a42c5d2b3f96f92a8