| commit | e2b9dee957ad1b437309747d269d7431491b48d3 | [log] [tgz] |
|---|---|---|
| author | Martijn Coenen <maco@google.com> | Wed Nov 16 09:59:32 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Nov 16 09:59:32 2016 +0000 |
| tree | 522f777b0dee03f95beb844c44d4acfcb9e52dc2 | |
| parent | 1005ca3fdcfcf7929d5d6fee821cbc6ff2dc94b6 [diff] | |
| parent | ac64db9550713bd81fd50fc8d289ffa8a9c1270c [diff] |
Merge remote-tracking branch 'aosp/upstream-master' into upstream_merge am: ac64db9550 Change-Id: Ic9e76c70cc6c90333c0d8f5831de462d40328452