| commit | 483d43f5f689ce1ea8d864e24fb106c73d24080b | [log] [tgz] |
|---|---|---|
| author | Martijn Coenen <maco@google.com> | Wed Nov 16 10:29:07 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Nov 16 10:29:07 2016 +0000 |
| tree | 522f777b0dee03f95beb844c44d4acfcb9e52dc2 | |
| parent | ba7edc0e73b05426226091737a3d3b50e6525bba [diff] | |
| parent | b4950db3d7d9b08bacf2ff0695d2b622704a4bb4 [diff] |
Merge remote-tracking branch 'aosp/upstream-master' into upstream_merge am: ac64db9550 am: e2b9dee957 am: 3323a85476 am: b4950db3d7 Change-Id: Ida2ed2e1136f75f7f98b050169b58a5f21f5979e