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)
* commit '2be288ff70a54d330c12496958a42b6d9e52b51e':
  Fix build after C++11 migration.


Trivial merge