| commit | cc619e2eca624d293e0e7f65f82305a5d925dbf7 | [log] [tgz] |
|---|---|---|
| author | Hyunyoung Song <hyunyoungs@google.com> | Tue Jul 28 19:38:17 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 28 19:38:17 2015 +0000 |
| tree | fe9ed94353b09dda232fceb64691f96dcd5db8d3 | |
| parent | 9486780029868bc04e2bd2f2c2ed34283fa2d25d [diff] | |
| parent | 6ce4ac13964e2ecb852dba5c2cf35c55929f8fc7 [diff] |
am 6ce4ac13: am e6127759: resolved conflicts for merge of 13ef17a3 to mnc-dr-dev b/22609402 Change-Id: I140cf972d57e14737a6f91c0b4a8ec6c7ff1af2b * commit '6ce4ac13964e2ecb852dba5c2cf35c55929f8fc7': resolved conflicts for merge of 13ef17a3 to mnc-dr-dev b/22609402 Change-Id: I140cf972d57e14737a6f91c0b4a8ec6c7ff1af2b