| commit | b1de5915f00786874e7df5b324059222ddc79cbb | [log] [tgz] |
|---|---|---|
| author | Unsuk Jung <unsuk@google.com> | Sat Sep 12 20:32:18 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Sep 12 20:32:18 2015 +0000 |
| tree | e9970ba746a4cce8ed06edd6bf72a0b404905d97 | |
| parent | 80b30d77a6d446f7cd405b901a6202fa5b263d9c [diff] | |
| parent | ff9926ee397cf94d37298bcfa67939f16205a426 [diff] |
am ff9926ee: Revert "resolved conflicts for 5365cd9e to lmp-mr1-dev" * commit 'ff9926ee397cf94d37298bcfa67939f16205a426': Revert "resolved conflicts for 5365cd9e to lmp-mr1-dev"