tree 18342dbe06d1d56229eb1fb49e466b340989d331
parent 804147cb7d533f5635da6adc28fbca1467a3078b
parent 08e72d0161e39e99ff1003bf1ce894f37d7b7eb4
author Iliyan Malchev <malchev@google.com> 1336666799 -0700
committer Iliyan Malchev <malchev@google.com> 1336666799 -0700

resolved conflicts for merge of 08e72d01 to jb-dev-plus-aosp

Change-Id: If00e354a5953ed54b31963d4f8ea77e1603c321e