| commit | e8e0ee078914a43db742ad5c717e8ceda55ad48d | [log] [tgz] |
|---|---|---|
| author | Etan Cohen <etancohen@google.com> | Fri Sep 30 21:06:24 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Sep 30 21:06:24 2016 +0000 |
| tree | eeaadb54e30d7643a87ada2a246771d728db748d | |
| parent | a06821b2cfd04988c4841d55bb63edcfe4322ac4 [diff] | |
| parent | 12b48830328c7251013ac076dee863963df03674 [diff] |
Merge changes from topic 'cherry-pick' am: e3d5fa1094 am: 12b4883032 Change-Id: Icebffbcb4057e278d7b7c42448ac4e626060eaeb