| commit | 0ff8590e78d32a38169f1a1f0156d5287f9d6162 | [log] [tgz] |
|---|---|---|
| author | Yabin Cui <yabinc@google.com> | Fri Jul 24 13:58:03 2015 -0700 |
| committer | Yabin Cui <yabinc@google.com> | Fri Jul 24 13:58:03 2015 -0700 |
| tree | 856faecfd3ce26838cf3ebb285b339ad61b26780 | |
| parent | 470df782f4efd255aa907ea7393918a6aef8aef6 [diff] | |
| parent | bff406978aad1a599d01f539d0a9b5718aaceca3 [diff] |
resolved conflicts for merge of bff40697 to mnc-dr-dev-plus-aosp Change-Id: I7d7a614a5eb987ef6aecd32ed15a6eaa43e93957