Filip Gruszczynski c7becb7ee7 resolved conflicts for merge of 47249f2a to mnc-dev ...

This is a merge of chin support.

Change-Id: I436b751b3c4aaa6b46cfcdb475e02eedfa5a5635

2015-05-20 20:15:29 -07:00

..

android

resolved conflicts for merge of 47249f2a to mnc-dev

2015-05-20 20:15:29 -07:00

google/android

…