| commit | 422e972b0548a7f3d2b76e6a5ec9dd77c05283cb | [log] [tgz] |
|---|---|---|
| author | Christopher Wiley <wiley@google.com> | Wed Aug 05 10:20:42 2015 -0700 |
| committer | Christopher Wiley <wiley@google.com> | Wed Aug 05 10:20:42 2015 -0700 |
| tree | 505ab764bb0d91d9839cc0e1ffd466040f281322 | |
| parent | 450c53ace6a8c61f0fdf2058307b5e04db617f49 [diff] | |
| parent | 7d1be4004725dff2043928268f2ad7d8db23633c [diff] |
resolved conflicts for merge of 7d1be400 to mnc-dr-dev-plus-aosp Change-Id: I2c62de9beb50ea1661b114a9d02b11ba73a28d82