| commit | 78420edc0f3e99684c36f0d516744b4d9312a1c1 | [log] [tgz] |
|---|---|---|
| author | Benoit Goby <benoit@android.com> | Fri Mar 29 16:29:22 2013 -0700 |
| committer | Benoit Goby <benoit@android.com> | Fri Mar 29 16:29:22 2013 -0700 |
| tree | a9edd378ec3c49ed73605b56cab60d18cbb136da | |
| parent | 9c37960cd9169c160d9865a6d63e256e125b4aae [diff] | |
| parent | 352004220a4ae6161d031a20380d862fe482b70d [diff] |
resolved conflicts for merge of 35200422 to jb-mr2-dev-plus-aosp Change-Id: I754b8b17a7e3a6e4ef3ccf0a02beca0fc72ba749