| commit | 1005ca3fdcfcf7929d5d6fee821cbc6ff2dc94b6 | [log] [tgz] |
|---|---|---|
| author | Sven <sven@sven-johannsen.de> | Fri Jul 15 21:30:23 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jul 15 21:30:23 2016 +0000 |
| tree | 7bf4634a4e8722e41f0af1bedcfde6072c3c23f9 | |
| parent | 728c934f1cd0104daf967eba58e855fc181e74cb [diff] | |
| parent | 34357a8d58d352e00cad2274294fb4be32c9707c [diff] |
Merge remote-tracking branch \\\'aosp/upstream-master\\\' into mymerge am: 01950b6483 am: db1632fadc am: 34357a8d58 Change-Id: If2fbb87ab570e49596bd2c6fcadb06726d81e738