OSDN Git Service

Merge "More on issue #12031685 (DO NOT MERGE)" into klp-dev
authorDianne Hackborn <hackbod@google.com>
Fri, 7 Mar 2014 18:12:30 +0000 (18:12 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 7 Mar 2014 18:12:30 +0000 (18:12 +0000)
commit785d764bd56b2d41216aa52ab8f6b6af9179f9c9
tree7d6a1de560c7af56598a405fd8e7f6f05774999a
parentfaddd77a917dd423aee5fc64c056c8c2e0ce6f9a
parentcb15c7a83b62a37e5def14413e37925391e5ea39
Merge "More on issue #12031685 (DO NOT MERGE)" into klp-dev