| commit | 4bfe6cfa421a4d5a168c42c276bb918643329ca3 | [log] [tgz] |
|---|---|---|
| author | Unsuk Jung <unsuk@google.com> | Sat Sep 12 21:08:29 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Sep 12 21:08:29 2015 +0000 |
| tree | f7f20ff9df34a2b6d52dbc2835b2683e2908efad | |
| parent | 805b05f08c23f73ccbb154b0b2530f929cff88c9 [diff] | |
| parent | 00146ee02ef61edd1f8356afcbfe71fe7e62a2fa [diff] |
am 00146ee0: am d0b27881: am 05613b13: am 877f8b49: am 379ba809: am b1de5915: am ff9926ee: Revert "resolved conflicts for 5365cd9e to lmp-mr1-dev" * commit '00146ee02ef61edd1f8356afcbfe71fe7e62a2fa': Revert "resolved conflicts for 5365cd9e to lmp-mr1-dev"