commit | dfebe85a1bfb5a43360fae36bb28621b480afdea | [log] [tgz] |
---|---|---|
author | Pirama Arumuga Nainar <pirama@google.com> | Wed Oct 26 17:53:41 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Oct 26 17:53:41 2016 +0000 |
tree | 6de7c938229dbb5032eb1a67905a65584783ebee | |
parent | fbf5bac792e0c885ff93a41ce4424b99a9d9f957 [diff] | |
parent | 55f81b67822f6e528bda0b159cfcec04d7927c0e [diff] |
Incremental squash-merge of aosp/dev to aosp/master am: 2cbe93a352 am: 55f81b6782 Change-Id: I179a547e050affc14f1010139704af966d3fe441