| commit | 38a9d5a739cb95758e3f40cb240c1511a309d4f7 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Sat Jan 31 02:00:26 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jan 31 02:00:26 2015 +0000 |
| tree | 18d14f52c0ec8e87803e737585e2b2d4b05d7e28 | |
| parent | 9f159c577cfe7088f3b9eb32906b0bae1d31ba5a [diff] | |
| parent | 10500d0ea7706a6a137e8afdd347d927f5512488 [diff] |
am 10500d0e: resolved conflicts for merge of 5cb4276e to lmp-mr1-dev-plus-aosp * commit '10500d0ea7706a6a137e8afdd347d927f5512488': Add target recoveryimage-nodeps.