| commit | 896afb075d043e4b54103ceb2d59e5e5a4142ff6 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Mon Aug 03 11:36:50 2015 -0700 |
| committer | Ying Wang <wangying@google.com> | Mon Aug 03 11:36:50 2015 -0700 |
| tree | e6f2724dbbd150f3066acbb32b6bc5a0b584d91e | |
| parent | df17743ab3c71401ef21398888a5b1aeca715809 [diff] | |
| parent | 0f32d65d6c4b4c6af73b71bcda4e671902f699db [diff] |
resolved conflicts for merge of 0f32d65d to mnc-dr-dev-plus-aosp Change-Id: I5be45feb780c67c08dbef035f2f6481ae6338f90