commit | afe9f55ee6ba3eaee02e7b13809a534ebe98d34a | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Wed Apr 30 00:57:49 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 30 00:57:49 2014 +0000 |
tree | 3470b8cfa5ef7aa3779b970e609e9b2622524b73 | |
parent | 580f92ed197df706d276011a3864b6deb1653aed [diff] | |
parent | ead2b4961589267398006d83fe2a91c66b42b442 [diff] |
am ead2b496: am 871af5c3: Merge commit \'64af6148cfd55ad55ea491473ed42c168299c94e\' into HEAD * commit 'ead2b4961589267398006d83fe2a91c66b42b442':