commit | d355ff07a5e906d7f9c4de120c9b722a21f83d2c | [log] [tgz] |
---|---|---|
author | Jeff Sharkey <jsharkey@google.com> | Fri May 27 22:03:12 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri May 27 22:03:12 2016 +0000 |
tree | f1d64fe82a24febaea69c128ed00946c3be88f81 | |
parent | a4f8847af48efd6ff09d6d856134438283c23f63 [diff] | |
parent | 268b04e16052d5ef76954b6688f9d35b23509d83 [diff] |
Merge changes from topic \'am-e885a22f20324bb0b94c97a807186535\' into nyc-mr1-dev-plus-aosp am: 268b04e160 * commit '268b04e16052d5ef76954b6688f9d35b23509d83': Change-Id: Ia32b871506040920765c906d324fb7df3f98c1bb