| commit | 78e0cbdde4635906118c69c388c51bd36dadab47 | [log] [tgz] |
|---|---|---|
| author | Dmitriy Ivanov <dimitry@google.com> | Tue May 26 11:21:11 2015 -0700 |
| committer | Dmitriy Ivanov <dimitry@google.com> | Tue May 26 11:21:11 2015 -0700 |
| tree | 24bcfcd89b72c044dd647f8621a74081d43b92c9 | |
| parent | 4f4b7708f609ca316680feb2a8c73c7d0186d0dd [diff] | |
| parent | c36ed7a14ec92dee029d0fa5918afc71a475432b [diff] |
Merge remote-tracking branch 'aosp/upstream-master' into mymerge