tree f55169a959d9e53abfb55ba1053b2778e75f150f
parent 40276a5228f99c38ca40f71dca2d7c054bdbdeec
parent 9edaaa4cdfd4a9765e67807bb82edd4c2ded4ae0
author Andreas Gampe <agampe@google.com> 1449541174 -0800
committer android-build-merger <android-build-merger@google.com> 1449541174 -0800

Merge "ART: Fix PACKED size of tls_ptr_size." am: 9f62af0e1c am: 96c37a70b6
am: 9edaaa4cdf

* commit '9edaaa4cdfd4a9765e67807bb82edd4c2ded4ae0':
  ART: Fix PACKED size of tls_ptr_size.