tree 17647abe829b4edc2597670fb123e2209e1ef4ea
parent d08c27f0fa410dd4e300eb328fa1520b7eafc2d0
author Jake Whatley <jacob.whatley91@gmail.com> 1457662976 -0500
committer Humberto Borba <humberos@gmail.com> 1457997902 -0300

vendor: add aosp merge script

Signed-off-by: Humberto Borba <humberos@gmail.com>
Signed-off-by: Jake Whatley <jacob.whatley91@gmail.com>
Change-Id: I2fb57d51858a562dc701d0f1e32b9c6e94ef03dd