| commit | 877f8b49b956e144975e2f257422af8a2a06c689 | [log] [tgz] |
|---|---|---|
| author | Unsuk Jung <unsuk@google.com> | Sat Sep 12 20:44:54 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Sep 12 20:44:54 2015 +0000 |
| tree | 922b3773e0eb3b5f0e3cb91ace8a988b3c5f1bf4 | |
| parent | 1afbbf002508e504c4f4a12288a8f08db7e20c18 [diff] | |
| parent | 379ba8099cd3cd0e7db6599bdf86162b63aa83ae [diff] |
am 379ba809: am b1de5915: am ff9926ee: Revert "resolved conflicts for 5365cd9e to lmp-mr1-dev" * commit '379ba8099cd3cd0e7db6599bdf86162b63aa83ae': Revert "resolved conflicts for 5365cd9e to lmp-mr1-dev"