| commit | ad0090e7b8c70cf44609aafbfea8c3946e2802a9 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Wed Oct 17 10:02:22 2012 -0700 |
| committer | Kenny Root <kroot@google.com> | Wed Oct 17 10:02:22 2012 -0700 |
| tree | e00685d10039cdcd83a33a7e848724d724b9b787 | |
| parent | 9cb417b76fa72b3a53c6ce6d4017b389f553a2b8 [diff] | |
| parent | 85f9ba9e7fdf9c3bf063f2e4c44a670861b4f199 [diff] |
resolved conflicts for merge of 85f9ba9e to jb-mr1-dev-plus-aosp Change-Id: I9ae49075935f0e9ec432ce9d828ee26a4fcdb44c