commit f1391dcad1ec9a56104ee83e2b88187e7d68a948
author Felipe Leme <felipeal@google.com> Wed Jun 10 21:04:51 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Jun 10 21:04:51 2015 +0000
tree 99d2228b6b8b22985a10c076f24200d0e13a92b7
parent 866c375e92116169390799300f348a4bec3911e2
parent a6dd714a5ab620cf5b84c2d1f680ddacf763559d

am a6dd714a: Merge "Added new options (--eial, --elal, --efal, and --esal) to pass multiple extras as ArrayList instead of Array. BUG: 21757911 Change-Id: I7e2a9c81ad4606a8aba90ea4820ba0732a1c8749 	modified:   src/com/android/commands/am/Am.java  On branch handles_arr

* commit 'a6dd714a5ab620cf5b84c2d1f680ddacf763559d':
  Added new options (--eial, --elal, --efal, and --esal) to pass multiple extras as ArrayList instead of Array. BUG: 21757911 Change-Id: I7e2a9c81ad4606a8aba90ea4820ba0732a1c8749 	modified:   src/com/android/commands/am/Am.java  On branch handles_array_list  Changes to be committed: 	modified:   src/com/android/commands/am/Am.java