am 79e6e466: (-s ours) DO NOT MERGE reset to goog/klp-volantis-dev
authorQiwen Zhao <zhao@google.com>
Tue, 10 Dec 2013 18:47:17 +0000 (18:47 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 10 Dec 2013 18:47:17 +0000 (18:47 +0000)
* commit '79e6e4661c327607f81908906509bfb8b948398f':


Trivial merge