Merge "Exception handling for SL4A APIs" am: efe653ff8e am: b6ad48e219

Change-Id: I2b6fcf9224597529994159ee1e476d27b97a59d7
tree: 6d4ec43dd4d1009e219b4ae8f129dcd54b7de6a4
  1. acts/
  2. tools/
  3. wts-acts/
  4. Android.mk
  5. OWNERS
  6. PREUPLOAD.cfg