[automerger skipped] Merge "Switch to exceptions for most cp calls" am: ece7e231a6
am: bc6c1ff8df
am: 99ae565fbf
-s ours
Change-Id: Id452e98ddddecac0644973cb3fa47f55b0bdcc6b
This commit is contained in:
commit
1d4cd97354