| commit | 4f583b9d1116da4e9e9564978a67829f2d578f4e | [log] [tgz] |
|---|---|---|
| author | Ji-Hwan Lee <jihwan@google.com> | Mon Jun 23 10:33:57 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 23 10:33:57 2014 +0000 |
| tree | 1d89fa32b741c183fad73f074332012d78b1f1de | |
| parent | c788c7955d78de08edb50abcaf621eea0b85b51a [diff] | |
| parent | ad42c9e905306982a0c38c32088da20e69fa200e [diff] |
am ad42c9e9: Proper resolution of conflict for 8062092a * commit 'ad42c9e905306982a0c38c32088da20e69fa200e': Proper resolution of conflict for 8062092a