| commit | 42cc98ea8c4396083f9bae0bd18553836f612d20 | [log] [tgz] |
|---|---|---|
| author | Siva Velusamy <vsiva@google.com> | Tue Sep 15 00:22:26 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 15 00:22:26 2015 +0000 |
| tree | a0657000affb56d9399929ab77c4f5367f00f7ac | |
| parent | f5ed55c37ec41d92e27c1ed17b9cee28bee3dec7 [diff] | |
| parent | a541aa6559f314648153d0905445e3b256da3d42 [diff] |
am a541aa65: resolved conflicts for 3f9d7b08 to stage-aosp-master * commit 'a541aa6559f314648153d0905445e3b256da3d42': platform tools version: replace alpha1 with rc1