| commit | db1632fadc79df388a2a7248157c965ee40248a1 | [log] [tgz] |
|---|---|---|
| author | Sven <sven@sven-johannsen.de> | Fri Jul 15 21:24:25 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jul 15 21:24:25 2016 +0000 |
| tree | 7bf4634a4e8722e41f0af1bedcfde6072c3c23f9 | |
| parent | a7aad22e27abd91b7c88b99bad057d3b72e11ac1 [diff] | |
| parent | 01950b6483ba3d71ecff360d11ed83abaea42187 [diff] |
Merge remote-tracking branch \'aosp/upstream-master\' into mymerge am: 01950b6483 Change-Id: Id316aa08e6fe20ffbdc32ecf3c69f9010e6b32c8