tree 8093fd58ff8e54468681fc5686c37bd4b260d5c7
parent d52cdfb89f9acfb44f80fc366fd1a4c7337101f1
parent 2b6aa352e5f8b432a934a228df7fe640249b36b6
author TreeHugger Robot <treehugger-gerrit@google.com> 1490657826 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1490657830 +0000

Merge changes Ia971b2bc,I0001eb3d,I55a6951e

* changes:
  Remove framework-protos from SystemUI
  Disable proguard for PluginDummyLib
  Enable multidex for dx