tree ed7eefec7f3613c2f2f408012deb545ed0d0142a
parent 977e1f263cee9023baf12cb430b5547e415e763e
parent d3f0e0ae379f4420b01bb9de932a764c035ff2a6
author Brian Carlstrom <bdc@google.com> 1365023134 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1365023134 +0000

Merge "resolved conflicts for merge of 02e8d730 to jb-mr2-dev-plus-aosp" into jb-mr2-dev-plus-aosp