OSDN Git Service

Merge "Cherry pick parts of f5df700e6ce."
authorNarayan Kamath <narayan@google.com>
Thu, 27 Mar 2014 14:33:57 +0000 (14:33 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 27 Mar 2014 14:33:57 +0000 (14:33 +0000)
commit7289b6497678da291b390dadbbd4a385f18f4aa1
tree008ac1c92451a2f4eae4cd28929b9be301f399b5
parent9cddbd258d24029a6498898e96cb53aa62349767
parent37764c71a0ac79142f90bb112b6cabffb940b955
Merge "Cherry pick parts of f5df700e6ce."