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: ddee7d94 am: da3a7d4c am: 4fdce744 * commit '4fdce744':
