tree e4559eb2d13fba9228544766a53b22a1f7fbd4f3
parent f86aed1ed3bb7d16a0ee34596472d386c3964e31
parent f20a5700a4c739a54fddf631886df4255672b7a6
author Jeff Sharkey <jsharkey@android.com> 1444697195 -0700
committer Jeff Sharkey <jsharkey@android.com> 1444697505 -0700

resolved conflicts for f20a5700 to master

Change-Id: I1f13a63c3680901fac58ef709118c9242032b11f