tag | 6651a2d9b5c37bc02f16acb403a99fc22ec4a7e3 | |
---|---|---|
tagger | Conley Owens <cco3@android.com> | Thu Jul 16 14:29:32 2015 -0700 |
object | 97836cf09f20e229524aff167c205d89edda3d52 |
repo 1.12.23
commit | 97836cf09f20e229524aff167c205d89edda3d52 | [log] [tgz] |
---|---|---|
author | Conley Owens <cco3@android.com> | Mon Jul 13 16:36:27 2015 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Mon Jul 13 16:36:28 2015 +0000 |
tree | 28265ea07277872db38ebcdf5bbc248c12ac9018 | |
parent | 80e3a37ab546984bd8494a12204ea10d734e6958 [diff] | |
parent | 551dfecea9667c8ae68e51a327f1ad9712573e27 [diff] |
Merge "Always output upstream if specified"