| commit | 5da565a85ae3de7f1bede59f371bf36032c5aedd | [log] [tgz] |
|---|---|---|
| author | Dan Willemsen <dwillemsen@google.com> | Thu Jun 16 15:50:46 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jun 16 15:50:46 2016 +0000 |
| tree | 68519e3ab09f9bce1e86087f1f416a19cbef7651 | |
| parent | cf771ed98f58b83a2f886e7d42e42dc89a707346 [diff] | |
| parent | 3068a859628d579438f0494580ae2846a4dc73c6 [diff] |
Merge changes Ib6ffcc38,Ia58e6bc1 am: 3068a85962 Change-Id: I20aec66ac749a5db3f65e368e14a5caca12afff8