| commit | 9e917470f1f2e5c054a646268c85b8b4be43c2af | [log] [tgz] |
|---|---|---|
| author | Sridhar Gujje <sgujje@codeaurora.org> | Wed Dec 09 15:53:33 2015 +0530 |
| committer | Sridhar Gujje <sgujje@codeaurora.org> | Wed Dec 09 15:53:33 2015 +0530 |
| tree | 884d2c7f7bc624572f85a5be3ec91f015f1ec972 | |
| parent | cfae4f034e82591afdf4e5ed72279297d0eee618 [diff] | |
| parent | f93d9400486049ecde26d4dc2818d2e72664dcb3 [diff] |
Merge tag 'android-6.0.0_r26' into HEAD Android 6.0.0 release 26 * tag 'android-6.0.0_r26': Pass in current android.jar to api-generator Import translations. DO NOT MERGE Bump support library version to 23.0.1 DO NOT MERGE Add customtabs support lib to extras/android/support/ Revert "Add customtabs support lib to extras/android/support/" Add customtabs support lib to extras/android/support/ Update LayoutLib revision number. [DO NOT MERGE] Change-Id: I2d84e8dc053182d2eab0cdbcb7a464a4e5c8c8f0