| commit | 6038c48b2a127f7946f7fb536b065ecf026d98c1 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Tue Sep 22 19:58:47 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 22 19:58:47 2015 +0000 |
| tree | 46d5567b2ac4dbb3a230df5a6432c882272a862c | |
| parent | c780fceb6550bd976e5d2add6fcc751292ab169d [diff] | |
| parent | 64b45509f2686d0ff5ed852abdce598736d10379 [diff] |
am 64b45509: (-s ours) DO NOT MERGE ANYWHERE: Merge commit \'7679e48230a3b2ddb530c6626825fd7bd854bd24\' into manual_merge_7679e482 * commit '64b45509f2686d0ff5ed852abdce598736d10379':