| commit | 822c2b6e07f0799e9a59dca642b827ea4d6796e8 | [log] [tgz] |
|---|---|---|
| author | Adrien Schildknecht <adriens@google.com> | Sat Dec 03 04:15:07 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Sat Dec 03 04:15:07 2016 +0000 |
| tree | 9763285b1a3e7bbac4f48d4c39f83cf078b5a2ad | |
| parent | 22570fa2ec306ffdc9208f6c1a40ac628ceebed7 [diff] | |
| parent | 298394ac6890e4f0d110645665be49bb0c3a8fc8 [diff] |
Manually merge commit 'bf03f2e' into stage-aosp-master am: a083ba6a48 am: 298394ac68 Change-Id: I21a5898232427ee759f33f53bd1c5c96f4cc5439