| commit | b009280d5acb85a7c7e51daf52a9834ba63a8ae7 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Wed Apr 30 00:58:53 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 30 00:58:53 2014 +0000 |
| tree | 5402e081244dac3c12be8d634581f46a8c546973 | |
| parent | 58ea37fe26fc733db478e606374f08d8a9d070cc [diff] | |
| parent | e4f00b2aaea069474c342e257a0e8e191245905a [diff] |
am e4f00b2a: (-s ours) Merge commit \'6d05ef2310bdc84811d5b0385b009ad11447a749\' into HEAD * commit 'e4f00b2aaea069474c342e257a0e8e191245905a':