diff options
| author | Dan Bornstein <danfuzz@google.com> | 2008-10-03 10:34:57 -0700 |
|---|---|---|
| committer | Glenn Kasten <gkasten@google.com> | 2012-10-17 11:24:39 -0700 |
| commit | 4cb4f7ce9184de9a221239c28afcf912e7e1ed43 (patch) | |
| tree | 6d653ee5b01f2322e86e47820495ba141b699128 /cmds | |
| parent | 8cb08825a7ca647d5c8f4c7a38a2d39392cae5c8 (diff) | |
| download | frameworks_av-4cb4f7ce9184de9a221239c28afcf912e7e1ed43.zip frameworks_av-4cb4f7ce9184de9a221239c28afcf912e7e1ed43.tar.gz frameworks_av-4cb4f7ce9184de9a221239c28afcf912e7e1ed43.tar.bz2 | |
Manually merge change #111620 from tc3 to mainline, to keep the
automerger from choking on it.
p4 sync
p4 integrate -r -b android_to_tc3 //...@111620,111620
p4 resolve -a
p4 resolve # resolve a couple merge travesties
PRESUBMIT=passed
BUG=1399648
TBR=edheyl
OCL=111902
Change-Id: I854b01553dd92bbf9c864f5a9bd51a3d665f0ac2
Signed-off-by: Glenn Kasten <gkasten@google.com>
Diffstat (limited to 'cmds')
0 files changed, 0 insertions, 0 deletions