| commit | 1ac6c9b2d8361bbff4059e94c6db34a579882551 | [log] [tgz] |
|---|---|---|
| author | Jerome Dochez <jedo@google.com> | Mon Jun 01 21:08:20 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Jun 01 21:08:20 2015 +0000 |
| tree | cbd7f156e7868deeb14c18e70c33506cdae687bd | |
| parent | db434af09fd97820ba64972c025d777f5ba5dda4 [diff] | |
| parent | 123e11dfdb29a6d4709426fd735163bd31184c5a [diff] |
DO NOT MERGE updated version to 1.2.4 automerge: 1e9af09 -s ours automerge: 123e11d -s ours * commit '123e11dfdb29a6d4709426fd735163bd31184c5a': DO NOT MERGE updated version to 1.2.4