| commit | f6f74bd79dafe91b4f3264c1f1737af7a7bc6241 | [log] [tgz] |
|---|---|---|
| author | Jason Evans <jasone@canonware.com> | Wed Jun 15 19:21:39 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jun 15 19:21:39 2016 +0000 |
| tree | 9cc8f6f8968bfb297d351dfc227ccd14d3378c6e | |
| parent | 58c6f7b86bf7261042a6ff29f2647923738f48ce [diff] | |
| parent | 5ab62bd1b55ef0804dbea305f8697bf9d247f3a4 [diff] |
Merge remote-tracking branch \'aosp/upstream-release\' into fix am: 5ab62bd1b5 Change-Id: If5c1e35afa0672bd4bd497bc9f1a953be932fe22