| commit | 1dcf70da3e76c7f43415e5c7dc4fd862e0e16d95 | [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 | a57e77f6cbe57fbdae2c9d94203c7f10687c4797 | |
| parent | c2364df4a237e9d5aa1c3978fc0e284b82320947 [diff] | |
| parent | 6c868fa910873bba0cc8d44c7d56515814b472fb [diff] |
resolve merge conflicts of 4ff55e3879 to mnc-dr2-dev-plus-aosp. Change-Id: I15fd4ea29cc25311ece779ef19a7aab41b4427ba