aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKonstantinos Menychtas <kmenychtas@google.com>2015-08-09 15:36:18 -0700
committerKonstantinos Menychtas <kmenychtas@google.com>2015-08-09 15:36:18 -0700
commitc8f7ca09183d3a1788df46b2479971f6311ce0d9 (patch)
treec0916ae9ed5525872df4ab7985f37db7b6eb0608
parenta88b03e155d2600122083726653b10a4eb90d2c8 (diff)
parent5830261a467cbb73e6b8be906d7f29f1af23cdcb (diff)
downloadsdk-c8f7ca09183d3a1788df46b2479971f6311ce0d9.zip
sdk-c8f7ca09183d3a1788df46b2479971f6311ce0d9.tar.gz
sdk-c8f7ca09183d3a1788df46b2479971f6311ce0d9.tar.bz2
resolved conflicts for merge of 5830261a to jb-dev-plus-aosp
Change-Id: I3b3a1c6dadeaa1afc6423f328b25f13dde196d54
0 files changed, 0 insertions, 0 deletions