| commit | a50b652184630d247a8acb1a52db7fbaaca374c2 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Wed Apr 30 17:33:51 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 30 17:33:51 2014 +0000 |
| tree | b9a334dc6f2ffadb14205c9c422f201f7432a18c | |
| parent | de4dea765aeddf8629dd8da8414bc85bb0451e0e [diff] | |
| parent | 9f791ad809b3dcdd6e7186493fb9d01d7ad5c124 [diff] |
am 9f791ad8: am 1333e012: Merge commit \'4102af05a86aae36d2560fd8b3f740a52399342c\' into HEAD * commit '9f791ad809b3dcdd6e7186493fb9d01d7ad5c124':