| commit | 745e5c739424ee93d7b0d7578b0f5c10fad8de42 | [log] [tgz] |
|---|---|---|
| author | Dmitriy Ivanov <dimitry@google.com> | Thu Oct 22 15:51:25 2015 -0700 |
| committer | Dmitriy Ivanov <dimitry@google.com> | Thu Oct 22 15:51:25 2015 -0700 |
| tree | abbb019c92d7fba7261b26cbae7d00ee37e85121 | |
| parent | 85558f701ee6f155f98c80b64fd46d9589db4c5f [diff] | |
| parent | e6a9aea7e77d03409cac1610598bd4b0073e01f0 [diff] |
Merge remote-tracking branch 'aosp/upstream-master' into mymerge Change-Id: Id7ba841d2447b1e13e9f3777b395e2a3e4e77812