commit 39ca7e49e3cb21426af452fa98f31fcbd79a4728
author Felipe Leme <felipeal@google.com> Wed Jun 10 23:15:57 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Jun 10 23:15:57 2015 +0000
tree daf60d0966919589f5deaf439b29da98cf34fb8c
parent e50f4866a5717b989c641df52628ceeaf5ad7055
parent f1391dcad1ec9a56104ee83e2b88187e7d68a948

am f1391dca: 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 branc

* commit 'f1391dcad1ec9a56104ee83e2b88187e7d68a948':
  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