| commit | b6e6201e475696f9af5e799ae749177a4ff1bff2 | [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 | 71444e945c772d00f5cac5eacec5fdfd840644d7 [diff] | |
| parent | 46868b8d9495c564fb024e1607207362b43d58d2 [diff] |
resolved conflicts for merge of bff40697 to mnc-dr-dev-plus-aosp Change-Id: I7d7a614a5eb987ef6aecd32ed15a6eaa43e93957