| commit | 385529184d8fe7c50ebc364822e090a11dc4a21d | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Fri Feb 20 00:37:06 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 20 00:37:06 2015 +0000 |
| tree | b77856b578798c122f957c8bca509fd20fbf4819 | |
| parent | 1810e4b06e3baa22b313ae202bede074dd26aee5 [diff] | |
| parent | 06c5ee1c8b437602951b9c7559e6cd017366feaa [diff] |
am 06c5ee1c: am 839b4928: Merge commit \'30c9f2e4a66b4213d5c903a5eda2f15d747e0654\' into HEAD * commit '06c5ee1c8b437602951b9c7559e6cd017366feaa':