tree 8f9e753071a5bbf08eac924b576c09efd5990e54
parent 145d61e0c7f2584c65d6eb454496013408d707af
parent 02e8d73079e279fac152d1d3caf36afaeab6c5bf
author Brian Carlstrom <bdc@google.com> 1365022993 -0700
committer Brian Carlstrom <bdc@google.com> 1365022993 -0700

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

Change-Id: I63d6a2f975a6c0df5c238a2f7592f357441eb767