tree 4f71e9fbc853c2e7d02df78cf5b4b092537e18c7
parent dba01032b2766567d676a6b9b7ebb044d897a0ef
parent 80f171f82abd9589bcea5f4f1ada0aa013538c69
author Raphael Moll <raphael@google.com> 1367620207 -0700
committer Raphael Moll <raphael@google.com> 1367620531 -0700

resolved conflicts for merge of 80f171f8 to jb-mr1-dev-plus-aosp

Change-Id: I5f5b53b63af86ccd421e280f847420c714bf924f