tree 61b32ccaee5dbc7a8952ec85f54c735580ea3445
parent 48df4996d8ada41f5e153bf72a46b66f511c309b
parent 90d020d979fb32dc4d639687794eabf51a9bf798
author Jeff Sharkey <jsharkey@google.com> 1492806033 +0000
committer android-build-merger <android-build-merger@google.com> 1492806033 +0000

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

Change-Id: I7988898a2f2404e9af76b95190bd6ad839b85d77