| commit | 536b81afed42ba6be1f824cf90d9a1e17a913c9c | [log] [tgz] |
|---|---|---|
| author | Jeff Brown <jeffbrown@google.com> | Fri Jun 08 15:27:01 2012 -0700 |
| committer | Jeff Brown <jeffbrown@google.com> | Fri Jun 08 15:27:01 2012 -0700 |
| tree | ae87781b25cacf61c784d1881e421c9ed8c007b2 | |
| parent | d96544ff69601fe2990245e10e054480f0bd341f [diff] | |
| parent | 053b865412d1982ad1dc0e840898d82527deeb99 [diff] |
resolved conflicts for merge of 053b8654 to jb-dev-plus-aosp Change-Id: Idfef8c26b7a9e1a1a202e21dc5d34022bbaa92cc