OSDN Git Service

(root) / android-x86 / frameworks-base.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c1c1e02 d1515a2)
Merge "fix dashboards page. the src attributes were being modified by the devsite...
authorsmain@google.com <smain@google.com>
Fri, 20 May 2016 00:26:46 +0000 (00:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 May 2016 00:26:46 +0000 (00:26 +0000)
commitf5bc587bfa869f64511472736f54820772e08a05
tree0a643697e660e0a2676b8b99b1854d301dd1ac84tree | snapshot
parentc1c1e02fede8e0b91bc255afb1fa52f9ac87e4cbcommit | diff
parentd1515a26e8a2ccfc04e55c9ad84ac5adcad410cacommit | diff
Merge "fix dashboards page. the src attributes were being modified by the devsite parser, so i renamed those attributes then rename them again at runtime. bug: 28801246" into mnc-mr-docs am: 486f792d44 am: 9ad92619dc am: ccf143ea10 am: eaad66b697
am: d1515a26e8

* commit 'd1515a26e8a2ccfc04e55c9ad84ac5adcad410ca':
  fix dashboards page. the src attributes were being modified by the devsite parser, so i renamed those attributes then rename them again at runtime. bug: 28801246

Change-Id: Ide9ab23c3241852d9b2321c08e15cb38bda83197
frameworks/base
About OSDN
Find Software
Develop Software
Help