| commit | 225e8943b8b9b14c8110a110f10d424aa504fdad | [log] [tgz] |
|---|---|---|
| author | Michael Wright <michaelwr@google.com> | Mon Sep 26 14:25:02 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Sep 26 14:25:02 2016 +0000 |
| tree | ffd3c9b4bfa48ee3bece9a25b55396635c3cbc34 | |
| parent | 60feb757502a91018237c189e287698f7345d06b [diff] | |
| parent | 98f6bbbec89452fa56f8f18641acf86df7e0e24d [diff] |
Merge changes from topic 'aosp-generics-api' am: fe9357f6e7 am: 98f6bbbec8 Change-Id: Iffa1f7621e298f0528dbf8d9be82c1d842982b62