| commit | 50d6ab60e3aeae23e302ac56aea6d977803e85cf | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Tue Sep 20 18:26:18 2016 -0700 |
| committer | Xin Li <delphij@google.com> | Tue Sep 20 18:26:18 2016 -0700 |
| tree | 8bbc7015e0696ba170f6385fc38c5364d6c5a7ed | |
| parent | 2de19aaaeff1ee603c66fa1445323e23290f6b02 [diff] | |
| parent | 0b85cc2b43f2010f86c738e73b8747f3621f5c7f [diff] |
Merge branch 'aosp/studio-master-dev' into HEAD