| commit | dcd1a89d22bc6ecc9d0e23cbb4d787f31149e45f | [log] [tgz] |
|---|---|---|
| author | Christopher Ferris <cferris@google.com> | Wed Jun 15 19:25:32 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jun 15 19:25:32 2016 +0000 |
| tree | 9cc8f6f8968bfb297d351dfc227ccd14d3378c6e | |
| parent | 58c6f7b86bf7261042a6ff29f2647923738f48ce [diff] | |
| parent | f6f74bd79dafe91b4f3264c1f1737af7a7bc6241 [diff] |
Merge remote-tracking branch \\'aosp/upstream-release\\' into fix am: 5ab62bd1b5 am: f6f74bd79d Change-Id: I59bd8d6ee0d7962472eb776f497e65c9eb9a905d