| commit | 35e53780e6336b23a8b299f81c3528ab00c3dcad | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Wed Mar 25 16:18:42 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 25 16:18:42 2015 +0000 |
| tree | e79f12c58b823f7c40b513b986344ffcf78fe143 | |
| parent | f5e9c93bc589aa96cbe96cd3b7f4e7ab1304372e [diff] | |
| parent | 0498d64edaf1068a01aa441dd26ba9dc1d7610b7 [diff] |
am 0498d64e: (-s ours) Merge commit \'8b468ac192571e59592e0341af56b5bcf462400a\' into HEAD * commit '0498d64edaf1068a01aa441dd26ba9dc1d7610b7': Merge commit '8b468ac192571e59592e0341af56b5bcf462400a' into HEAD