OSDN Git Service

Merge "Despotted back." into klp-dev
authorJohn Spurlock <jspurlock@google.com>
Sat, 14 Sep 2013 21:30:21 +0000 (21:30 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sat, 14 Sep 2013 21:30:21 +0000 (21:30 +0000)
commit0819e3422106ef2368fa7539a325bae63bdffb26
tree7234340e34bf29fff33d12033a9040731ac7735f
parentcb1b8f43b6a0bc34bbbfc2f059f421df6b12e4bb
parentb9b2fa9249319843d93860ad7bba283bc465dfd7
Merge "Despotted back." into klp-dev