| commit | 0b88861edfe5c0d57e0bb4a1cccb04f1916b5e9f | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu May 03 18:35:53 2012 -0700 |
| committer | Elliott Hughes <enh@google.com> | Thu May 03 18:35:53 2012 -0700 |
| tree | 4b68db62ffd23980f58ccb53c68a1f3aa2583c0d | |
| parent | 901167c1d78403bedcb48a20f46a971fae392a27 [diff] | |
| parent | 93a44a282327b44a84af59f201eaf58df02c449f [diff] |
resolved conflicts for merge of 93a44a28 to jb-dev-plus-aosp Change-Id: I9c1f2e37602bea86e70333d2b274665e99fcbd92