| commit | c91b3f7c2848dec7b4db8a6583a7a44af6d4d0e9 | [log] [tgz] |
|---|---|---|
| author | Andy McFadden <fadden@android.com> | Thu Dec 05 22:51:52 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 05 22:51:52 2013 +0000 |
| tree | 46b6a182d174deace26c5bc5f66ffb4a8b46fd44 | |
| parent | f0178153cc96144a17fd5dd548e01be51fc242db [diff] | |
| parent | 26248749a159d8a121b496cb48520873cf3e0a03 [diff] |
am 26248749: (-s ours) am 00dbc7ba: am 46052913: Better error message * commit '26248749a159d8a121b496cb48520873cf3e0a03':