| commit | 8bd0986197dddf8d781702aa4d21d7bc30e6117b | [log] [tgz] |
|---|---|---|
| author | Adrien Schildknecht <adriens@google.com> | Sat Dec 03 04:20:07 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Sat Dec 03 04:20:07 2016 +0000 |
| tree | 2fe73bb68353f2064d8516302a3ece14c5e26581 | |
| parent | 6218291e8c257a178824d67aa8841ab5ca988f28 [diff] | |
| parent | cba965e372462f7416a69d9709ea8bc6781ec3e4 [diff] |
Manually merge commit '61e74d7' into stage-aosp-master am: 9f9a239ca3 am: aec7316546 am: 669716d27c Change-Id: I75f9c115fe178008174f1fea8cb8b890b83c2543