| commit | 0d511afcb8ad3d1e540476541cb696aa824b1cab | [log] [tgz] |
|---|---|---|
| author | Tao Bao <tbao@google.com> | Tue Jul 28 17:03:09 2015 -0700 |
| committer | Tao Bao <tbao@google.com> | Tue Jul 28 17:03:09 2015 -0700 |
| tree | fa66bb84884ff61ec3e9fc1b07d851d4af025fc0 | |
| parent | ebbe8b5414be0a18452a15a242de825949386a1d [diff] | |
| parent | 910d3822691eb7dd54124b800bd2c3e8a99f3968 [diff] |
resolved conflicts for merge of 910d3822 to mnc-dev-plus-aosp Change-Id: Ied44516c7c2e46b93965dbdb8fb4bc98d6ed3310