tree ce92f12f5b09755bbe8b6345f8d5091ee3e98b05
parent a17c58ff59b405b48633b4d850d70b9cfab959d8
parent 4b32f7c676e014c3d59aac280be6a159cef3d4b8
author Jeff Sharkey <jsharkey@google.com> 1492805450 +0000
committer android-build-merger <android-build-merger@google.com> 1492805450 +0000

Merge "Fix code accounting bugs, track external app data." into oc-dev
am: 4b32f7c676

Change-Id: Ie14bf66fd93d6c461983a5232d4164c815cb56b7