am c69ff83f: resolved conflicts for merge of 748fb34d to lmp-mr1-dev

Browse Source

* commit 'c69ff83feb6f6b0ebc0f4997a84cadc14bdd4488':
  Update SDK Pkg revision for API 21 to 3 [DO NOT MERGE]

...

This commit is contained in:

Deepanshu Gupta

2015-01-06 22:44:32 +00:00

committed by Android Git Automerger

parent ef8e455e20 c69ff83feb

commit 2aa06dbe20

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available