tree e040b9784cd40c0f07f3eee3412189d02216faee
parent 36b1864b8bc3e975859f28b0ea3a6f64434eeda6
parent 73ecfe917d685f2838e64fe47432bfaffb60b170
author Elliott Hughes <enh@google.com> 1475684827 +0000
committer android-build-merger <android-build-merger@google.com> 1475684827 +0000

Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge" am: ecaf114d8d am: f6bf43d4d4
am: 73ecfe917d

Change-Id: I3f1609c71510a98ce1114dfbfa3a246908c3cfa4