| commit | a642e3543a4ffdaaf1456768968ae05a205ed4f4 | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Fri Apr 07 10:46:45 2017 -0700 |
| committer | android-build-team Robot <android-build-team-robot@google.com> | Thu Jun 15 19:10:31 2017 +0000 |
| tree | a71aee837870db9d66bde7226ae2393c190b794d | |
| parent | 61657b2d87b88576ab1b7d7fb5768b0e315c9216 [diff] |
Merge commit 'bbc9221' into master This merges the history from upstream without making any changes to the code. Bug: 33280507 Change-Id: I303a906c2cb361cdc2b9a6c99da2b09782467254 (cherry picked from commit 5e48fb0cc42f4c09080930e5c5ded1ef4bc89eed) (cherry picked from commit d4aea7c865084a140a965d4c413c6c38f9a2743a)