| commit | 1ce4bec576ee0d120463ede13d7c7a044616cb89 | [log] [tgz] |
|---|---|---|
| author | Brian Muramatsu <btmura@google.com> | Wed Jun 20 22:16:56 2012 -0700 |
| committer | Brian Muramatsu <btmura@google.com> | Wed Jun 20 22:16:56 2012 -0700 |
| tree | 0108defd40541fe1bacd73af8f14e1c08c5a6f1f | |
| parent | 4a56017c7d1c48784a98d925c96ec29373ef160a [diff] | |
| parent | 20297e9e53fe36278a4d9ef9b53390bf93d2ac2a [diff] |
resolved conflicts for merge of 20297e9e to jb-dev-plus-aosp Change-Id: I30207aa0bb492934c9f11b758b445be583b6b171