| commit | 783e115b6008eb3425d1b3f82aff9fd5249b47aa | [log] [tgz] |
|---|---|---|
| author | Scott Main <smain@google.com> | Wed Nov 14 19:04:05 2012 -0800 |
| committer | Scott Main <smain@google.com> | Wed Nov 14 19:04:05 2012 -0800 |
| tree | 79884322d39aef1560f4d1275e6954c6f9a4c877 | |
| parent | ce37f1da3619dcb4e53ca014cf4a17885cc3af0f [diff] | |
| parent | e907a3909d456278b3310c2d2b33e45487efff9a [diff] |
resolved conflicts for merge of e907a390 to jb-dev-plus-aosp Change-Id: I4e216b81f33b4b7c238f74f1c475bc84df3f79ef