OSDN Git Service

Merge "Squashed commit of the following:" into jb-mr2-dev
authorAndreas Huber <andih@google.com>
Tue, 12 Mar 2013 20:57:57 +0000 (20:57 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 12 Mar 2013 20:57:58 +0000 (20:57 +0000)
commitc148e7a671c289f82f6ca40e29defcc43e1c6d0b
treeda24c7ca1f2d19047b17131bcf1f484ba2745aea
parent2a5177e8a72585b6f4da972d86f436d31cd4674a
parentd5e56231a598b180a1d898bb7dc61b75580e59a4
Merge "Squashed commit of the following:" into jb-mr2-dev