| commit | 050c66aa7d52f0f0203c59d1a5020570d28ae687 | [log] [tgz] |
|---|---|---|
| author | Miao Wang <miaowang@google.com> | Tue Oct 13 18:02:44 2015 -0700 |
| committer | Miao Wang <miaowang@google.com> | Tue Oct 13 18:02:44 2015 -0700 |
| tree | 183ce4e0d01f179b65ce54b4e25dfb698d11b609 | |
| parent | 5cf8e72b09bb1cd0b2310dec90d9941f1982bd57 [diff] | |
| parent | 3db22d4d147221c7bf467ffcb9b4bd37d8346140 [diff] |
resolved conflicts for 3db22d4d to mnc-dr-dev-plus-aosp Change-Id: I2baac9e5b218fba7ec7cc4df9b518b6b90a343d2