| commit | ca6dd9c00f43f074aa584623c329c19c508ef17b | [log] [tgz] |
|---|---|---|
| author | Yorke Lee <yorkelee@google.com> | Tue May 13 23:59:55 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 23:59:55 2014 +0000 |
| tree | 967f2714b7c695a2c8690d8099672ae2c639bbb8 | |
| parent | a0005a45ac188f7638d275e8df4870d73c2b93d4 [diff] | |
| parent | b428689142d236505b73c09bf48244b174b3f6a1 [diff] |
am b4286891: (-s ours) resolved conflicts for merge of cd1fa392 to master-nova * commit 'b428689142d236505b73c09bf48244b174b3f6a1':