tree fc039d8bd2e36d0bc5a3de2d7f875ac38a144fc6
parent 136059f118b580a3dc8f3023d1d19c8c56020a01
parent 67c0500290e6fe4850e23d5e3cc772a065bd698a
author Jean-Baptiste Queru <jbq@google.com> 1375480107 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1375480107 -0700

Reconcile with AOSP jb-mr2-dev - do not merge