tree f9d4670d5ac61840223b644422338f9c8e1a782a
parent be3770f3f932c5242e387b5dbc8baa75fb3bf373
parent b7bad4f22a3da1128111d1865057f002327783e3
author Scott Main <smain@google.com> 1297189571 -0800
committer Scott Main <smain@google.com> 1297189571 -0800

resolved conflicts for merge of b7bad4f2 to honeycomb-plus-aosp

Change-Id: Ie672e1d34ca045127e2cf1fcb29dafb5ab998c37