Merge branch \'mnc-dr1.5-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr1.5-dev
am: ddee7d949d

* commit 'ddee7d949dbd1fd5d18e11322532e78cd8330554':