tree fc0fcda09341f155cf6a12e78b28fca00b2a7f5d
parent ca9c13a51da963a6a1d399e774d32da491368519
parent a48f77b5badf04bfcb9f9fe4839efda4f83309a2
author Ying Wang <wangying@google.com> 1365221320 -0700
committer Ying Wang <wangying@google.com> 1365221378 -0700

resolved conflicts for merge of a48f77b5 to jb-mr2-dev-plus-aosp

Change-Id: I6f978c9bd94fbe23a3789b2ae81ab7d86b3c2d71