| commit | 6e3fac6d6f8e9f2da3d41984f0e1ece8946adecc | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Sat Mar 21 16:20:29 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Mar 21 16:20:29 2015 +0000 |
| tree | 1d9ce682b121714ec4a53b66d6dfd6d5d1b8b04b | |
| parent | 0d26a24f4792b43008bf73c3df9c755df0c6f4a0 [diff] | |
| parent | a3e11ee0f25ba5ea40815138d0ff0b8dadf9810a [diff] |
am a3e11ee0: am 9afb2932: am 6445b0c5: resolved conflicts for merge of 2fa17026 to lmp-mr1-ub-dev * commit 'a3e11ee0f25ba5ea40815138d0ff0b8dadf9810a':