| commit | 649143648073116b2ffb6af412b41ecec5280f86 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Mon Apr 29 23:30:40 2013 -0700 |
| committer | Kenny Root <kroot@google.com> | Mon Apr 29 23:30:40 2013 -0700 |
| tree | 3b85b8d1158410fa1c6063151416d1fe8c3c4d46 | |
| parent | 3b22f4d2da535cd865e8dfd9f06f3ce273e20c0f [diff] | |
| parent | 3c10f535786bf4676664b937b617ec891b0ee25b [diff] |
resolved conflicts for merge of 3c10f535 to jb-mr2-dev-plus-aosp Change-Id: Id4ab035f92f2a8bf1b1fefdfd22ba370e33e7829