tree 4f71e9fbc853c2e7d02df78cf5b4b092537e18c7
parent 07f6904f97f1b5de82a7c76ef828fde65559706b
parent c5fd733f1d080207801ac2ab5197eb9d6b346071
author Raphael Moll <raphael@google.com> 1367650174 -0700
committer Raphael Moll <raphael@google.com> 1367650174 -0700

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

Change-Id: I5e5ef53138eb5b6c0935be74c23c60248503da79