tree cec8398b051160938a1d87a529cfc3d0880b8e5b
parent c58dcda94f54eacc583b82ea29acb4c30de292f0
parent e7c4d04aed7fbb6400ec91607803139751411f97
author Qiwen Zhao <zhao@google.com> 1426910945 -0700
committer Qiwen Zhao <zhao@google.com> 1426910945 -0700

reset to lmp-mr1-dev-plus-aosp with history. DO NOT MERGE ANYWHERE.