| commit | 39c5e9f87670a8bc543a716ac994c8c85ac94cd5 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Wed Apr 30 12:17:24 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 30 12:17:24 2014 +0000 |
| tree | aaedb12aaccc159d74b7c4bb126d815a7ce4912b | |
| parent | 791781bfb8cdcdf90e32968159603e2fe5098d94 [diff] | |
| parent | b009280d5acb85a7c7e51daf52a9834ba63a8ae7 [diff] |
am b009280d: am e4f00b2a: (-s ours) Merge commit \'6d05ef2310bdc84811d5b0385b009ad11447a749\' into HEAD * commit 'b009280d5acb85a7c7e51daf52a9834ba63a8ae7':