| commit | 8d52f3a917e8b3cefca73336f3f9853635836996 | [log] [tgz] |
|---|---|---|
| author | Miao Wang <miaowang@google.com> | Sat Nov 21 19:09:55 2015 -0800 |
| committer | Miao Wang <miaowang@google.com> | Sat Nov 21 19:09:55 2015 -0800 |
| tree | a4b31f4c5adb9eaad14da777187ed10c0542554f | |
| parent | 19c48aee6214a3037124978f122a360294d8036c [diff] | |
| parent | 4ff55e387967fe1ce6fce2c754621810e5bfd839 [diff] |
resolve merge conflicts of 4ff55e3879 to mnc-dr2-dev-plus-aosp. Change-Id: I15fd4ea29cc25311ece779ef19a7aab41b4427ba