tree c657c4603c41f1cac92c540bd5e1eb07b4b0c9ad
parent d0d4d44d344779e59ee196637bbc745d68d70677
parent 78afed1c15989d4aa7e66094afa81cd3a6d22674
author Kenny Root <kroot@google.com> 1350434661 -0700
committer Kenny Root <kroot@google.com> 1350434661 -0700

resolved conflicts for merge of 78afed1c to jb-mr1-dev-plus-aosp

Change-Id: I861e3a6aa07c448909b2ae54618bba178bd6e457