| commit | 90ca7bfb7fc5c91f1593ad0efb8e294cf956b5c4 | [log] [tgz] |
|---|---|---|
| author | Juan Silveira <jjso@google.com> | Tue Apr 28 22:11:29 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 28 22:11:29 2015 +0000 |
| tree | c17053aa432de03c0d2213c63670fe3c4f3f6aa7 | |
| parent | c68dba6080b13aba4f72bcf616f29af8e0bf617e [diff] | |
| parent | 4a9673333abfffe0b3603d412e1f3bc134b443ac [diff] |
am 4a967333: (-s ours) am 2a22b4d8: DO NOT MERGE * commit '4a9673333abfffe0b3603d412e1f3bc134b443ac': DO NOT MERGE