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)
commitc93484ab9fdf044fd32f2388a3ce29040d2ba319
tree2fc7e1214a66459a1fb32ab6f87ee292a0a2e4c4
parent89bb7e8c9ffdca2b97fce27a166f3edba4be6546
parent9dffd24e00a1b2abd5e2dcc2366c0327ec3701b8
Merge "Squashed commit of the following:" into jb-mr2-dev