am 2be288ff: Merge "Fix build after C++11 migration."
authorDan Albert <danalbert@google.com>
Tue, 25 Nov 2014 19:58:43 +0000 (19:58 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 25 Nov 2014 19:58:43 +0000 (19:58 +0000)
commitd54bcb8078f86282a93e38b8f5f5578b905bf5c8
tree23bf8b8d2e14599f13ee3d8bf9f14d2046ed14a9
parent221028ea9690c9607cdd2c5874d6cf03b3f19aec
parent2be288ff70a54d330c12496958a42b6d9e52b51e
am 2be288ff: Merge "Fix build after C++11 migration."

* commit '2be288ff70a54d330c12496958a42b6d9e52b51e':
  Fix build after C++11 migration.