| commit | 4af5aa6359141f6ef6c061c5358830eb106d779c | [log] [tgz] |
|---|---|---|
| author | Hyunyoung Song <hyunyoungs@google.com> | Thu Aug 27 20:22:33 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 20:22:33 2015 +0000 |
| tree | 73def3b48c94e98e819856af2701e0cc598bbf80 | |
| parent | 08535a574e603bd50f5ea89f8eef4378c23e945d [diff] | |
| parent | 82bf63fbdff18686ab28e3c510e3b2dda9046979 [diff] |
am 82bf63fb: am e1d69c9d: (-s ours) resolved conflicts for merge of 13ef17a3 to mnc-dev-plus-aosp * commit '82bf63fbdff18686ab28e3c510e3b2dda9046979': resolved conflicts for merge of 13ef17a3 to mnc-dev-plus-aosp