OSDN Git Service

resolved conflicts for merge of b35e4d77 to jb-dev-plus-aosp
authorJake Hamby <jhamby@google.com>
Thu, 30 Aug 2012 01:09:29 +0000 (18:09 -0700)
committerJake Hamby <jhamby@google.com>
Thu, 30 Aug 2012 01:09:29 +0000 (18:09 -0700)
commit044a9b97b01a934e6cd9ef2f2914d401c4fa145b
tree21450aa0e67015ebc06fc7f9dc51d85f1c5012e5
parent4a4edbbfce2e1a8b34b5b9ff2793eace303dae5a
parentb35e4d778a95d89c9c9317de0f93f51faab5bbac
resolved conflicts for merge of b35e4d77 to jb-dev-plus-aosp

Change-Id: Idec590dbd9e051a3faeded1af9eb4a78216f0496