From: 黄涛 <huangtao@rock-chips.com>
Date: Wed, 30 Nov 2011 02:36:13 +0000 (+0800)
Subject: Merge remote-tracking branch 'aosp/android-3.0' into develop-3.0
X-Git-Tag: firefly_0821_release~9733^2~12
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=7c35ccce3aacd7a83f7e7f6e81d5aaaed170899d;p=firefly-linux-kernel-4.4.55.git

Merge remote-tracking branch 'aosp/android-3.0' into develop-3.0
---

7c35ccce3aacd7a83f7e7f6e81d5aaaed170899d