tree cd8ba99ecf2906804797066c47cf7e48399cc519
parent 3ca3a3db5e6539818d8b4c1a633e45c0b78df96c
parent f6e9228b8a97603d3ceb8f0d61e8d87cf19bd21f
author Chris Wren <cwren@android.com> 1453921334 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1453921334 +0000

Merge "move framework metrics over to new proto"