OSDN Git Service

Reconcile with AOSP jb-mr2-dev - do not merge
authorJean-Baptiste Queru <jbq@google.com>
Fri, 2 Aug 2013 21:48:27 +0000 (14:48 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Fri, 2 Aug 2013 21:48:27 +0000 (14:48 -0700)
commit034b83e8668a0b26d1eccfc9fa433b8eae3e50a8
treefc039d8bd2e36d0bc5a3de2d7f875ac38a144fc6
parent136059f118b580a3dc8f3023d1d19c8c56020a01
parent67c0500290e6fe4850e23d5e3cc772a065bd698a
Reconcile with AOSP jb-mr2-dev - do not merge