| commit | 51cb97096814352127aed69e5ac97013e9172038 | [log] [tgz] |
|---|---|---|
| author | Jason Sams <jsams@google.com> | Wed Jul 02 23:19:27 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 02 23:19:27 2014 +0000 |
| tree | 786c3c4f6a75a9489d11bd768240473a8ef74d11 | |
| parent | 191ba124991908a09e7935c55296dd39ef0a0964 [diff] | |
| parent | 24bea6a3ef53733ffd1622dfa0bdaeea0a74303a [diff] |
am 24bea6a3: Resolve conflicts with AOSP. * commit '24bea6a3ef53733ffd1622dfa0bdaeea0a74303a': Resolve conflicts with AOSP.