Todd Kennedy 3b91bd2173 resolved conflicts for 7de7e0b0 to stage-aosp-master ...

(cherry picked from commit 9f86026444)

Change-Id: I4e45e5bbaebb98b0e740167eaf7517f99d917f30

2015-11-16 10:43:53 -08:00

..

android

resolved conflicts for 7de7e0b0 to stage-aosp-master

2015-11-16 10:43:53 -08:00

google/android

…