| commit | c4c3cc2ee9f1eb359700fac6c27984fd703f830d | [log] [tgz] |
|---|---|---|
| author | Dan Willemsen <dwillemsen@google.com> | Thu Jun 16 15:53:20 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jun 16 15:53:20 2016 +0000 |
| tree | ef6c035e9f44f3645d5becb4a1ae0e5f999a17a5 | |
| parent | 018d5d174a6a6d8a768ae51f203712e4e87b7f6a [diff] | |
| parent | 5da565a85ae3de7f1bede59f371bf36032c5aedd [diff] |
Merge changes Ib6ffcc38,Ia58e6bc1 am: 3068a85962 am: 5da565a85a Change-Id: Ib0c7157644c1d51f37b8c91c76adb35c2df00de6