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