| commit | e98c13ed66d4c1662e630c242ccfac8fe7274de5 | [log] [tgz] |
|---|---|---|
| author | Lajos Molnar <lajos@google.com> | Mon Oct 27 04:18:09 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 27 04:18:09 2014 +0000 |
| tree | f48ddf02eb142dcf63498141f4c0333ede3f0f49 | |
| parent | ef04c72130f90646b046fb6e3484f0216ff211b5 [diff] | |
| parent | 435d9cde2777950c1d93b0982839d6796c5688b2 [diff] |
am 435d9cde: resolved conflicts for merge of 67d8bd66 to lmp-dev-plus-aosp * commit '435d9cde2777950c1d93b0982839d6796c5688b2':