commit | aac085d66e4eb84e32c3ee9cbab2cf8c3078fc52 | [log] [tgz] |
---|---|---|
author | Kenny Root <kroot@google.com> | Tue May 13 22:17:06 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 22:17:06 2014 +0000 |
tree | 2339559b5b394883e678321cb3c43712bc79dd80 | |
parent | ff324e6395ce9fa7f3cc36db57ecdf1326242957 [diff] | |
parent | 86354b048e8d87c2a308ce9aafaac685406293fe [diff] |
am 86354b04: am 803fa99a: am d0916f36: Merge "dex2oat: convert NULL to nullptr" * commit '86354b048e8d87c2a308ce9aafaac685406293fe': dex2oat: convert NULL to nullptr