Ying Wang 002f53770a Apply --extra-packages in case --custom-pacakge is also specified.
Cherry-picked from master.

Change-Id: I2d67b8821afdf064f4186ccd8def1b65f9a7dc88
2012-04-26 13:13:08 -07:00
..
2012-02-17 19:01:26 -08:00
2012-03-17 14:12:57 -07:00
2012-03-17 14:12:57 -07:00
2012-03-16 15:25:17 -07:00